From 7416beb2ee67b1b3bcd30e16d53d85f01ae5491e Mon Sep 17 00:00:00 2001 From: WangHao <43278047@qq.com> Date: Sat, 10 Apr 2021 00:43:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunbookmark/BrowserController.java | 10 +- .../yunbookmark/SqBookmarkController.java | 4 +- .../ruoyi/web/test/controller/SqMenuTest.java | 20 +++ ruoyi-ui/src/components/Bkhead/index.vue | 41 +++++++ .../src/components/BookmarkList/index.vue | 4 +- ruoyi-ui/src/router/index.js | 15 +++ .../src/views/bookmark/bookmark/index.vue | 114 +++--------------- .../src/views/bookmark/common/ImportHtml.vue | 10 +- ruoyi-ui/src/views/bookmark/index/index.vue | 10 +- ruoyi-ui/src/views/bookmark/menu/index.vue | 59 ++++++--- .../com/ruoyi/bookmark/domain/SqBookmark.java | 3 +- .../bookmark/mapper/SqBookmarkMapper.java | 2 +- .../bookmark/service/ISqBookmarkService.java | 9 +- .../service/impl/SqBookmarkServiceImpl.java | 77 ++++++++---- .../mapper/bookmark/SqBookmarkMapper.xml | 2 + 15 files changed, 229 insertions(+), 151 deletions(-) create mode 100644 ruoyi-ui/src/components/Bkhead/index.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/BrowserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/BrowserController.java index 3a40345df..86bff4298 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/BrowserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/BrowserController.java @@ -54,7 +54,8 @@ public class BrowserController extends BaseController { @RequestMapping("/import") @PreAuthorize("@ss.hasPermi('bookmark:browser:export')") public AjaxResult importCollect(@RequestParam("htmlFile") MultipartFile htmlFile){ - logger.debug("开始上传状态是:"); + long startTime = System.currentTimeMillis(); + logger.info("开始上传状态是:"+ startTime ); SysUser sysUser=getAuthUser(); Long userID= sysUser.getUserId(); //防止重复上传 @@ -83,7 +84,14 @@ public class BrowserController extends BaseController { catch (Exception e) { logger.error("导入html异常:",e); } + + long endTime = System.currentTimeMillis(); + + float seconds = (endTime - startTime) / 1000F; + logger.info("导入用时:"+ Float.toString(seconds) ); + return AjaxResult.success("导入成功"); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java index 763a06f03..fda34be34 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqBookmarkController.java @@ -105,9 +105,9 @@ public class SqBookmarkController extends BaseController */ @GetMapping("/selectBymenuIdUserID") @PreAuthorize("@ss.hasPermi('bookmark:bookmark:common:listsousou')") - public TableDataInfo selectBymenuIdUserID(Long menuId,Integer sort,String sousuo) { + public TableDataInfo selectBymenuIdUserID(Long menuId,Integer sort,String sousuo,Integer bookmarkStar,Integer start) { startPage(); - List list = sqBookmarkService.selectBymenuIdUserID(menuId,getAuthUser().getUserId(),sort,sousuo); + List list = sqBookmarkService.selectBymenuIdUserID(menuId,getAuthUser().getUserId(),sort,sousuo,bookmarkStar,start); return getDataTable(list); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/SqMenuTest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/SqMenuTest.java index fdd33c562..977404002 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/SqMenuTest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/SqMenuTest.java @@ -4,6 +4,7 @@ import com.ruoyi.bookmark.domain.SqBookmark; import com.ruoyi.bookmark.domain.SqMenu; import com.ruoyi.bookmark.mapper.SqBookmarkMapper; import com.ruoyi.bookmark.mapper.SqMenuMapper; +import com.ruoyi.bookmark.service.ISqBookmarkService; import com.ruoyi.bookmark.service.ISqMenuService; import com.ruoyi.bookmark.service.impl.SqMenuServiceImpl; import org.apache.ibatis.session.ExecutorType; @@ -31,6 +32,8 @@ public class SqMenuTest extends BaseSpringBootTest{ @Autowired private ISqMenuService iSqMenuService; @Autowired + private ISqBookmarkService iSqBookmarkService; + @Autowired SqBookmarkMapper sqBookmarkMapper; @Autowired SqlSessionTemplate sqlSessionTemplate; @@ -87,6 +90,7 @@ public class SqMenuTest extends BaseSpringBootTest{ /** * 初始化是否有下级目录 subordinate 0无下级 1有下级 + * 批量计算新的目录下书签数量 * * @param * @return @@ -94,6 +98,17 @@ public class SqMenuTest extends BaseSpringBootTest{ @Test public void test3() { + iSqBookmarkService.bookmarkMenuCount(1L,442L); + + } + /** + * 初始化是否有下级目录 subordinate 0无下级 1有下级 + * + * @param + * @return + */ + @Test + public void test7() { SqMenu sqMenu2 = new SqMenu(); sqMenu2.setUserId(1L); List sqs = sqMenuMapper.select(sqMenu2); @@ -117,6 +132,11 @@ public class SqMenuTest extends BaseSpringBootTest{ } } + + + + + //测试mybatis的事务 @Test public void test4() throws Exception { diff --git a/ruoyi-ui/src/components/Bkhead/index.vue b/ruoyi-ui/src/components/Bkhead/index.vue new file mode 100644 index 000000000..9b404a448 --- /dev/null +++ b/ruoyi-ui/src/components/Bkhead/index.vue @@ -0,0 +1,41 @@ + + + + diff --git a/ruoyi-ui/src/components/BookmarkList/index.vue b/ruoyi-ui/src/components/BookmarkList/index.vue index a81219132..b55384d70 100644 --- a/ruoyi-ui/src/components/BookmarkList/index.vue +++ b/ruoyi-ui/src/components/BookmarkList/index.vue @@ -1,8 +1,7 @@