From beafe4f82f91583975da058700256bf8677d9c6a Mon Sep 17 00:00:00 2001
From: zhangmeng <1334717033@qq.com>
Date: Mon, 15 Nov 2021 18:06:57 +0800
Subject: [PATCH] =?UTF-8?q?update=202021=E5=B9=B411=E6=9C=8815=E6=97=A517:?=
 =?UTF-8?q?42:32?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/UrlRequestController.java      | 14 +++-
 .../admin/manager/feign/FictionFeign.java     |  3 +
 .../static/system/admin/js/mystyle-admin.js   |  3 +
 .../templates/admin/fiction/fiction_add.ftl   | 11 +--
 .../templates/admin/fiction/fiction_edit.ftl  | 75 +++++++++++++++++++
 .../templates/admin/fiction/fiction_list.ftl  |  4 +-
 6 files changed, 99 insertions(+), 11 deletions(-)
 create mode 100644 mystyle-cloud-admin-manager/src/main/resources/templates/admin/fiction/fiction_edit.ftl

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 ce532e7..aa0266e 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
@@ -15,13 +15,11 @@ import com.zhangmeng.model.dto.system.EncryptType;
 import com.zhangmeng.model.dto.system.Menu;
 import com.zhangmeng.model.dto.query.QueryParams;
 import com.zhangmeng.model.entity.*;
+import com.zhangmeng.model.vo.Result;
 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.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import springfox.documentation.annotations.ApiIgnore;
 import tk.mybatis.mapper.entity.Condition;
@@ -434,4 +432,12 @@ public class UrlRequestController extends BaseController {
     public ModelAndView fictionCollection_index() {
         return this.jumpPage("admin/fiction/fiction_list");
     }
+
+
+    @GetMapping("/fictionCollection/edit")
+    public ModelAndView fictionCollection_edit(@RequestParam("fiction_id") Long fiction_id,Model model){
+        FictionCollection fictionCollection = this.fictionFeign.findFictionCollectionById(fiction_id);
+        model.addAttribute("fictionCollection",fictionCollection);
+        return this.jumpPage("admin/fiction/fiction_edit");
+    }
 }
\ 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
index da7128c..ee23e65 100644
--- 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
@@ -3,6 +3,7 @@ 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.FictionCollection;
 import com.zhangmeng.model.entity.FictionDetails;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,4 +27,6 @@ public interface FictionFeign {
     @GetMapping(SysConstant.mystyle_cloud_fiction_prefix + "/findAllToFiction")
     List<Fiction> findAll();
 
+    @
+    FictionCollection findFictionCollectionById(@RequestParam("fiction_id") Long fiction_id);
 }
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 bd63542..b78f561 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
@@ -131,8 +131,11 @@ var mail_send_url = gate_way_url + "/" + mail_url + "/mail/sendEmail";
 //---------------------------------------------------------------------------------------------------------------------
 //小说列表
 var fiction_list_url = gate_way_url + "/" + fiction_url + "/fiction/list";
+var fiction_edit_url = gate_way_url + "/" + fiction_url + "/fiction/edit" + access_token_url;
+var fiction_save_url = gate_way_url + "/" + fiction_url + "/fiction/save";
 //小说集合列表
 var fictionCollection_list_url = gate_way_url + "/" + fiction_url + "/fictionCollection/list";
+var fictionCollection_add_url = gate_way_url + "/" + admin_manager_url + "/fiction/add" + access_token_url;
 
 //页面跳转
 function postToPage(url, token) {
diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/fiction/fiction_add.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/fiction/fiction_add.ftl
index af6d77c..1285f3d 100644
--- a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/fiction/fiction_add.ftl
+++ b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/fiction/fiction_add.ftl
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>小说集合添加</title>
-    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/system/component/pear/css/pear.css" />
+    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/pear/css/pear.css" />
 </head>
 <body>
 <form class="layui-form" action="">
@@ -38,8 +38,9 @@
         </div>
     </div>
 </form>
-<script src="${springMacroRequestContext.contextPath}/system/component/layui/layui.js"></script>
-<script src="${springMacroRequestContext.contextPath}/system/component/pear/pear.js"></script>
+<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/layui/layui.js"></script>
+<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/pear/pear.js"></script>
+<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/admin/js/mystyle-admin.js"></script>
 <script>
     layui.use(['form','jquery'],function(){
         let form = layui.form;
@@ -47,9 +48,9 @@
 
         form.on('submit(fiction-save)', function(data){
             var obj = data.field;
-            obj['token'] = localStorage.getItem("token");
+            obj['access_token'] = access_token;
             $.ajax({
-                url:'/fiction/save',
+                url:fiction_save_url,
                 data:obj,
                 type:'post',
                 success:function(result){
diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/fiction/fiction_edit.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/fiction/fiction_edit.ftl
new file mode 100644
index 0000000..781e060
--- /dev/null
+++ b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/fiction/fiction_edit.ftl
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html lang="en"  xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>小说集合添加</title>
+    <link rel="stylesheet" href="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/pear/css/pear.css" />
+</head>
+<body>
+<form class="layui-form" action="">
+    <div class="mainBox">
+        <div class="main-container">
+            <div class="main-container">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">小说名称</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="小说名称" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">小说href</label>
+                    <div class="layui-input-block">
+                        <input type="text"  name="href" lay-verify="title" autocomplete="off" placeholder="小说href" class="layui-input">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="bottom">
+        <div class="button-container">
+            <button type="submit" class="pear-btn pear-btn-primary pear-btn-sm" lay-submit="" lay-filter="fiction-save">
+                <i class="layui-icon layui-icon-ok"></i>
+                提交
+            </button>
+            <button type="reset" class="pear-btn pear-btn-sm">
+                <i class="layui-icon layui-icon-refresh"></i>
+                重置
+            </button>
+            <input type="hidden" id="fiction_id" name="fiction_id" value="${obj.id!}">
+        </div>
+    </div>
+</form>
+<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/layui/layui.js"></script>
+<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/component/pear/pear.js"></script>
+<script src="${springMacroRequestContext.contextPath}/mystyle-cloud-admin-manager/system/admin/js/mystyle-admin.js"></script>
+<script>
+    layui.use(['form','jquery'],function(){
+        let form = layui.form;
+        let $ = layui.jquery;
+
+        form.on('submit(fiction-save)', function(data){
+            var obj = data.field;
+            obj['access_token'] = access_token;
+            $.ajax({
+                url:fiction_save_url,
+                data:obj,
+                type:'post',
+                success:function(result){
+                    if(result.flag){
+                        layer.msg(result.message,{icon:1,time:1000},function(){
+                            parent.layer.close(parent.layer.getFrameIndex(window.name));//关闭当前页
+                            parent.layui.table.reload("category-table");
+                        });
+                    }else{
+                        layer.msg(result.msg,{icon:2,time:1000});
+                    }
+                }
+            });
+            return false;
+        });
+    })
+</script>
+<script>
+</script>
+</body>
+</html>
\ No newline at end of file
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 8fbaab6..756aca6 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
@@ -234,7 +234,7 @@
                 title: '新增',
                 shade: 0.1,
                 area: [common.isModile()?'100%':'900px', common.isModile()?'100%':'600px'],
-                content: '/fiction/add?token=' + token
+                content: fictionCollection_add_url
             });
         };
 
@@ -245,7 +245,7 @@
                 title: '修改',
                 shade: 0.1,
                 area: ['900px', '600px'],
-                content: '/category/edit?token=' + token + '&categoryId=' + obj.data.id
+                content: fiction_edit_url + '&categoryId=' + obj.data.id
             });
         };