文章缓存 redis定时转移到mongoDb

2020-10-12 23:29:13 +08:00
parent 11dc911d2b
commit 9ab209fe6b
15 changed files with 467 additions and 117 deletions
--- a/ruoyi-ui/src/api/note/note.js
+++ b/ruoyi-ui/src/api/note/note.js
@ -19,10 +19,25 @@ export function userGetNoteInfo(noteId) {



+// 新增便签管理
+export function addUserNote(data) {
+  return request({
+    url: '/note/note/addUserNote',
+    method: 'post',
+    data: data
+  })
+}



-
+// 修改便签文章的内容 实时保存
+export function userUpdateNote(data) {
+  return request({
+    url: '/note/note/userUpdateNote',
+    method: 'put',
+    data: data
+  })
+}


 // 查询便签管理列表
--- a/ruoyi-ui/src/components/BookmarkList/index.vue
+++ b/ruoyi-ui/src/components/BookmarkList/index.vue
@ -2,7 +2,7 @@
  <div>


-    <div v-for="bm in bookmarkList" class="bookmark" :data-id="bm.id" @click="windowurl(bm.url,bm.bookmarkId)">
+    <div v-for="bm in bookmarkList" class="bookmark"   @click="winurl(bm.noteId,bm.tiymceUeditor,bm.bookmarkId,bm.url)">
      <div class="bookmark-item">

        <span class="bookmark-title" >{{bm.title}}</span>
@ -48,9 +48,15 @@
        isdescription:false,
        noteTime:true,
        isBookmarkIcon:false,
+        Ueditor:undefined,
+
      }
    },
    created() {
+      var that=this;
+      //便签ID
+      that.Ueditor = that.$route.query.Ueditor;
+
      var a=2;
      if(a==2){
        //便签模式 只能这么显示
@ -73,8 +79,9 @@
    },

    methods: {
-      windowurl(A, B) {
-        this.$emit('on-windowurl', A, B)
+      winurl:function(noteId,tiymceueditor,bookmarkId,url) {
+
+       this.$emit('on-windowurl', noteId, tiymceueditor,bookmarkId,url);
      }

    }
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@ -161,6 +161,17 @@ export const constantRoutes = [
          title: '书签页面',icon:'user',
          requireAuth: false,//加该字段,表示进入这个路由是需要登录的true
        },
+        children: [
+          {
+            path: '/NqEdit',
+            name: 'NqEdit',
+            component: resolve => require(['../views/bookmark/common/NqEdit.vue'], resolve),
+            meta:{
+              title: 'Quill编辑器',icon:'user',
+              requireAuth: true,//加该字段,表示进入这个路由是需要登录的true
+            },
+          }
+        ]
      },{
        path: '/UserTagAll',
        name: 'UserTagAll',
@ -185,14 +196,6 @@ export const constantRoutes = [
          title: '测试页面',icon:'user',
          requireAuth: true,//加该字段,表示进入这个路由是需要登录的true
        },
-      },{
-        path: '/NqEdit',
-        name: 'NqEdit',
-        component: resolve => require(['../views/bookmark/common/NqEdit.vue'], resolve),
-        meta:{
-          title: 'Quill编辑器',icon:'user',
-          requireAuth: true,//加该字段,表示进入这个路由是需要登录的true
-        },
      }
    ],

--- a/ruoyi-ui/src/views/bookmark/bookmark/index.vue
+++ b/ruoyi-ui/src/views/bookmark/bookmark/index.vue
@ -22,14 +22,14 @@
        </div>

        <div class="sousouright-iconadd">
-          <el-dropdown trigger="click" size="small" :hide-on-click="false">
+          <el-dropdown trigger="click" size="small" :hide-on-click="true" >
              <span class="el-dropdown-link">
          <i class="el-icon-plus" style="font-size: 18px;"/>
             </span>
            <el-dropdown-menu slot="dropdown" class="sq-dropdown">
              <el-dropdown-item class="filter-item" icon="el-icon-plus" @click.native="addbookmarkurl">添加连接
              </el-dropdown-item>
-              <el-dropdown-item class="filter-item" icon="el-icon-plus" command="b">添加文本</el-dropdown-item>
+              <el-dropdown-item class="filter-item" icon="el-icon-plus" @click.native="addbooNote" >添加文本</el-dropdown-item>
              <el-dropdown-item class="filter-item" icon="el-icon-plus" command="d">导入书签</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
@ -59,9 +59,9 @@

          <div class="filter-tbar">
            <div class="filter-classification">
-              <div class="classification " @click="showopen(0)"><span>网页</span></div>
-              <div class="classification" @click="showopen(1)"><span>文本</span></div>
-              <div class="classification" @click="showopen(2)"><span>其他</span></div>
+              <div  :class="['classification',property=='0'?' classification-click':'']" @click="showopen(0)"><span>网页</span></div>
+              <div :class="['classification',property=='1'?' classification-click':'']" @click="showopen(1)"><span>文本</span></div>
+              <div :class="['classification',property=='2'?' classification-click':'']" @click="showopen(2)"><span>其他</span></div>
              <!--        <div class="classification" @click="showopen(3)"><span>其他</span></div>-->
            </div>
            <div class="setUpThe">
@ -290,10 +290,12 @@
                      <i class="el-icon-position"></i>
                    </div>
                  </el-header>
-                  <div class="main-url-title">部分网站不允许内嵌套打开,请在设置中选择自己喜欢的打开方式!</div>
+<!--                  <div class="main-url-title">部分网站不允许内嵌套打开,请在设置中选择自己喜欢的打开方式!</div>-->
                  <div class="mianUrl-botoom"  v-loading="iframeLoading"  >
 <!--                    webkitallowfullscreen="true" mozallowfullscreen="true" allowfullscreen="true"-->
-                    <iframe sandbox="allow-forms allow-scripts allow-popups" class="openurl" :src="gourl"  target="_self"  tabindex="-1"  />
+<!--                    <iframe sandbox="allow-forms allow-scripts allow-popups" class="openurl" :src="gourl"  target="_self"  tabindex="-1"  />-->
+                    <router-view :key="$route.query.t"></router-view>
+
                  </div>
        </el-main>
      </el-container>
@ -322,6 +324,7 @@
  import {
    selectBymenuNote,
    userGetNoteInfo,
+    addUserNote
  } from "@/api/note/note";
  import {format} from 'timeago.js';

@ -332,6 +335,8 @@

    data: function () {
      return {
+        //网页0 文本1 其他1
+        property:0,
        sousuo: '',
        drawer: false,
        // 遮罩层
@ -405,6 +410,7 @@
        noteParams: {
          pageNum: 1,
          pageSize: 15,
+          noteId: undefined,
          userId: undefined,
          title: undefined,
          description: undefined,
@ -419,7 +425,8 @@
          topFlag: undefined,
          isShare: undefined,
          isEncryption: undefined,
-          createUserName: undefined
+          createUserName: undefined,
+          tiymceUeditor:undefined
        },
      }
    },
@ -452,6 +459,7 @@
        // that.queryParams.menuId = 1;
      } else {
        that.queryParams.menuId = routedata;
+        that.noteParams.menuId = routedata;
      }

      //搜索值
@ -477,14 +485,10 @@

    },
    mounted() {
-      this.newBookmark();
+
    },
    methods: {
-      /**初始化 分类全部的意思**/
-      newBookmark() {
-        //默认选中 全部
-        document.getElementsByClassName("classification")[0].classList.add("classification-click");
-      },
+

      /**自动获取高度**/
      getHeight() {
@ -503,7 +507,7 @@
        //判断是否加载了所有数据
        var i = that.queryParams.pageNum + 1;
        that.$set(that.queryParams, 'pageNum', i)
-        console.log("this.queryParams.pageNum:" + that.queryParams.pageNum)
+        // console.log("this.queryParams.pageNum:" + that.queryParams.pageNum)
        var listcount = Math.ceil(that.total / 15);
        console.log("该目录共有页数:" + listcount)

@ -512,55 +516,45 @@
          that.noMore = true;
          that.listnoMore = true;
          that.listloading = false
-          console.log("禁止滚动了")
+          // console.log("禁止滚动了")
          return;
        } else {

          this.listloading = true
          setTimeout(() => {
-            selectBymenuIdUserID(this.queryParams).then(response => {
-              if (response.rows.length != 0 && response.code == 200) {
-                console.log("response.rows" + response.rows)
-                this.bookmarkList = this.bookmarkList.concat(response.rows);
-
-                this.total = response.total;
-                this.listloading = false
-                console.log("请求完毕" + that.queryParams.pageNum)
-              } else {
-                //出错了
-                //加载完毕了 禁止滚动
-                this.noMore = true;
-                this.listloading = false
-              }
-            });
+            switch(this.property) {
+              case 0:
+                this. getListConcat();
+                break;
+              case 1:
+                this.getNoteList();
+                break;
+              default:
+            }
          }, 1000);
        }

-        // if (this.queryParams.pageNum = listcount) {
-        //   //加载完毕了 禁止滚动
-        //   that.noMore = true;
-        //   that.listnoMore = true;
-        //   that.listloading = false
-        //   console.log("刚刚好2页 禁止滚动了")
-        // }

      },

      /**切换显示 全部 网页 文本 其他**/
      showopen(e) {
-        //1 是文本
-        if (e==1){
-          this.getNoteList();
-        }else if(e==0){
-          this.getList();
-        }
-        document.getElementsByClassName("classification")[e].classList.add("classification-click");
-        for (var i = 0; i < 4; i++) {
-          if (i != e) {
-            document.getElementsByClassName("classification")[i].classList.remove('classification-click');
-          }
-        }
+        var that=this;
+        that.property=e;
+        console.log("queryParams"+this.queryParams.pageNum);
+        console.log("noteParams"+this.noteParams.pageNum);

+        switch(e) {
+          case 0:
+            this.getList();
+            break;
+          case 1:
+            this.getNoteList();
+            break;
+          default:
+            this.bookmarkList=null;
+
+        }

      },
      /** 转换书签菜单数据结构 */
@ -695,6 +689,7 @@
          createTime: undefined,
          sqTags: [],
          sort: undefined,
+
        };
        this.resetForm("form");
      },
@ -730,7 +725,29 @@
      /**切换排序规则**/
      handleCommand(command) {
        this.queryParams.sort = command;
-        this.getList();
+        switch(this.property) {
+          case 0:
+            this.getList();
+            break;
+          case 1:
+            this.getNoteList();
+            break;
+          default:
+            this.getList();
+        }
+
+
+      },
+      /**添加遍签**/
+      addbooNote() {
+        addUserNote(this.noteParams).then(response => {
+          if (response.code === 200) {
+            this.msgSuccess("新增成功");
+            this.getNoteList();
+          }
+        });
+
+
      },

      /** 查询书签管理列表 */
@ -750,6 +767,25 @@
          }
        });
      },
+      /**查询书签 滚动加载分页拼接*/
+      getListConcat(){
+        this.loading = true;
+        selectBymenuIdUserID(this.queryParams).then(response => {
+          if (response.total != 0 && response.code == 200) {
+            console.log("response.rows" + response.rows)
+            this.bookmarkList = this.bookmarkList.concat(response.rows);
+            this.total = response.total;
+            this.listloading = false
+            this.loading = false;
+            console.log("请求完毕" + that.queryParams.pageNum)
+          } else {
+            //出错了加载完毕了 禁止滚动
+            this.noMore = true;
+            this.listloading = false
+            this.loading = false;
+          }
+        });
+      },

      /** 查询便签管理列表 */
      getNoteList() {
@ -760,14 +796,49 @@
            this.loading = false;
        });
      },
+      /**查询书签 滚动加载分页拼接*/
+      getNoteListConcat(){
+        this.loading = true;
+        selectBymenuNote(this.queryParams).then(response => {
+          if (response.total != 0 && response.code == 200) {
+            this.bookmarkList = this.bookmarkList.concat(response.rows);
+            this.total = response.total;
+            this.loading = false;
+            this.listloading = false
+
+          }else {
+            //出错了加载完毕了 禁止滚动
+            this.noMore = true;
+            this.listloading = false
+            this.loading = false;
+          }
+        });
+      },
+      // /**网站内打开*/
+      // windowurl(url,bookmarkId) {
+      //   var that=this;
+      //   //网站内打开
+      //   that.iframeLoading=true;
+      //   this.gourl=url;
+      //   setTimeout(function(){
+      //     that.iframeLoading=false;
+      //   },1000);
+      // },
      /**网站内打开*/
-      windowurl(url,bookmarkId) {
+      windowurl(noteId, tiymceueditor,bookmarkId,url) {
        var that=this;
-        that.iframeLoading=true;
-        this.gourl=url;
-        setTimeout(function(){
-          that.iframeLoading=false;
-        },1000);
+        console.log("noteId:"+noteId)
+        console.log("tiymceueditor:"+tiymceueditor)
+
+
+        that.$router.push({
+          path: "/NqEdit",
+          query: {
+            Ueditor: tiymceueditor,
+            noteId:noteId,
+            t:Date.now(),
+          }
+        })
      },
      /**新窗口打开*/
      windowurlOpen() {
--- a/ruoyi-ui/src/views/bookmark/common/NqEdit.vue
+++ b/ruoyi-ui/src/views/bookmark/common/NqEdit.vue
@ -16,7 +16,7 @@
    <div>
    <tinymce
      ref="editor"
-      v-model="msg"
+      v-model="queryParams.UeditorContent"
      :disabled="disabled"
      @onClick="onClick"
    />
@ -33,7 +33,9 @@
 </template>
 <script>
  import tinymce from '../../../components/TinyMCE'
-
+  import {
+    userUpdateNote,userGetNoteInfo
+  } from "@/api/note/note";
  const defaultForm = {
    status: 'draft',
    title: '', // 文章题目
@ -57,17 +59,60 @@
      return{
        postForm: Object.assign({}, defaultForm),
        msg: "<span>请尽情创作吧!</span>",
-        disabled: false
+        disabled: false,
+        queryParams:{
+          noteId: undefined,
+          userId: undefined,
+          title: undefined,
+          description: undefined,
+          menuId: undefined,
+          background: undefined,
+          noteCount: undefined,
+          noteSort: undefined,
+          isState: undefined,
+          readProgress: undefined,
+          isStar: undefined,
+          isDelete: undefined,
+          topFlag: undefined,
+          isShare: undefined,
+          isEncryption: undefined,
+          createUserName: undefined,
+          tiymceUeditor:undefined,
+          UeditorContent:undefined,
+        },
      }
    },
+    created() {
+      var that = this;
+      var Ueditor = that.$route.query.Ueditor;
+      var noteId = that.$route.query.noteId;
+      this.queryParams.tiymceUeditor=Ueditor;
+      this.queryParams.noteId=noteId;
+
+      //查看对应的文章 信息和标题等等
+      this.getNoteList();
+
+    },
    methods: {
-      // 鼠标单击的事件
+      /** 实时更新文章的信息 */
+      UpdateNote(){
+        userUpdateNote(this.queryParams).then(response =>{
+            console.log("已保存:"+Date.now())
+        });
+      },
+      /** 查询便签管理列表 */
+      getNoteList() {
+        userGetNoteInfo(this.queryParams.noteId).then(response => {
+          this.queryParams = response.rows;
+        });
+      },
+      //鼠标单击的事件
      onClick (e, editor) {
        console.log('Element clicked')
        console.log(e)
        console.log(editor)
      },
-      // 清空内容
+      //清空内容
      clear () {
        this.$refs.editor.clear()
      }