优化导入

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("导入成功");
+
     }
 
 

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<SqBookmark> list = sqBookmarkService.selectBymenuIdUserID(menuId,getAuthUser().getUserId(),sort,sousuo);
+        List<SqBookmark> list = sqBookmarkService.selectBymenuIdUserID(menuId,getAuthUser().getUserId(),sort,sousuo,bookmarkStar,start);
         return getDataTable(list);
     }
     /**

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<SqMenu> sqs = sqMenuMapper.select(sqMenu2);
@@ -117,6 +132,11 @@ public class SqMenuTest extends BaseSpringBootTest{
         }
 
     }
+
+
+
+
+
     //测试mybatis的事务
     @Test
     public void test4() throws Exception {